Keep the popup posted if the button is released over the cellview. This

2005-05-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
	the popup posted if the button is released over the cellview.
	This matches the behaviour of other combo box implementations.
	(#171378)

diff --git a/ChangeLog b/ChangeLog
index 59b8289db0e098838e103d85bf3dd06c4e0b7bca..cc33b7cc52fc2127205867f8c68738d884217238 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+       the popup posted if the button is released over the cellview.
+       This matches the behaviour of other combo box implementations.  
+       (#171378)
+       
        * gdk/gdkwindow.c (gdk_window_set_bg_pattern): Adjust offsets
        when recursing.  (#153682, Felipe Heidrich)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 59b8289db0e098838e103d85bf3dd06c4e0b7bca..cc33b7cc52fc2127205867f8c68738d884217238 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+       the popup posted if the button is released over the cellview.
+       This matches the behaviour of other combo box implementations.  
+       (#171378)
+       
        * gdk/gdkwindow.c (gdk_window_set_bg_pattern): Adjust offsets
        when recursing.  (#153682, Felipe Heidrich)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 59b8289db0e098838e103d85bf3dd06c4e0b7bca..cc33b7cc52fc2127205867f8c68738d884217238 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_list_button_released): Keep
+       the popup posted if the button is released over the cellview.
+       This matches the behaviour of other combo box implementations.  
+       (#171378)
+       
        * gdk/gdkwindow.c (gdk_window_set_bg_pattern): Adjust offsets
        when recursing.  (#153682, Felipe Heidrich)
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index e81823d86412129d25278ec7dcf32cac6a487dc3..f03ebb7ace5aed4b966c127e23155a90e8610a5a 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3417,7 +3417,8 @@ gtk_combo_box_list_button_released (GtkWidget      *widget,
 
   if (ewidget != combo_box->priv->tree_view)
     {
-      if (ewidget == combo_box->priv->button &&
+      if ((ewidget == combo_box->priv->button || 
+          ewidget == combo_box->priv->box) &&
           !popup_in_progress &&
           gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button)))
         {
@@ -3426,7 +3427,8 @@ gtk_combo_box_list_button_released (GtkWidget      *widget,
         }
 
       /* released outside treeview */
-      if (ewidget != combo_box->priv->button)
+      if (ewidget != combo_box->priv->button && 
+         ewidget != combo_box->priv->box)
         {
           gtk_combo_box_popdown (combo_box);